projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f2484df) | patch
Add conflict detection/resolution to vc-hg (bug#10709)
authorGlenn Morris <rgm@gnu.org>
Wed, 5 Dec 2012 01:49:31 +0000 (20:49 -0500)
committerGlenn Morris <rgm@gnu.org>
Wed, 5 Dec 2012 01:49:31 +0000 (20:49 -0500)
commit49596095d09227d828ffb6fed955ba0b660b4d92
treec3d733d7d5f1288711c59dabbadfa59e43decd48tree | snapshot
parentf2484dffa2bb96d245839eeae94153cf70209d42commit | diff
Add conflict detection/resolution to vc-hg (bug#10709)

* lisp/vc/vc-hg.el (vc-hg-resolve-when-done, vc-hg-find-file-hook):
New functions, for detecting and resolving conflicts.
lisp/ChangeLog diff | blob | history
lisp/vc/vc-hg.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.